From d0c29393dcd6b522f01195b07e696ab2c4c90ef0 Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Thu, 10 May 2018 09:34:46 -0700 Subject: [PATCH] Address review comment, no need to check export_dir. --- src/cargo/core/compiler/context/compilation_files.rs | 8 ++------ src/cargo/core/compiler/mod.rs | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/cargo/core/compiler/context/compilation_files.rs b/src/cargo/core/compiler/context/compilation_files.rs index a2e91ef7a..5359ac751 100644 --- a/src/cargo/core/compiler/context/compilation_files.rs +++ b/src/cargo/core/compiler/context/compilation_files.rs @@ -113,12 +113,8 @@ impl<'a, 'cfg: 'a> CompilationFiles<'a, 'cfg> { } } - pub fn export_dir(&self, unit: &Unit<'a>) -> Option { - if self.roots.contains(unit) { - self.export_dir.clone() - } else { - None - } + pub fn export_dir(&self) -> Option { + self.export_dir.clone() } pub fn pkg_dir(&self, unit: &Unit<'a>) -> String { diff --git a/src/cargo/core/compiler/mod.rs b/src/cargo/core/compiler/mod.rs index 8b503aaae..d1282ab83 100644 --- a/src/cargo/core/compiler/mod.rs +++ b/src/cargo/core/compiler/mod.rs @@ -362,7 +362,7 @@ fn link_targets<'a, 'cfg>( ) -> CargoResult { let bcx = cx.bcx; let outputs = cx.outputs(unit)?; - let export_dir = cx.files().export_dir(unit); + let export_dir = cx.files().export_dir(); let package_id = unit.pkg.package_id().clone(); let target = unit.target.clone(); let profile = unit.profile; -- 2.30.2